bitkeeper revision 1.1236.25.24 (42366e9aQ71LQ8uCB-Y1IwVNqx5eqA)

Merge djm@kirby.fc.hp.com://home/djm/src/xen/xeno-unstable-ia64.bk
into sportsman.spdomain:/home/djm/xeno-unstable-ia64.bk

diff --cc BitKeeper/etc/logging_ok
index d3fabe9b7d9063bfa3f544a11696ab862dad10fb,a937ce2b437f56108ba1d87aae2a741bcbba0f4e..4f55f3fe455da101c8625823002a48b231e6c4f9
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -20,8 -20,8 +20,10 @@@ cl349@freefall.cl.cam.ac.u
  cl349@labyrinth.cl.cam.ac.uk
  cwc22@centipede.cl.cam.ac.uk
  cwc22@donkeykong.cl.cam.ac.uk
+ djm@djmnc4000.(none)
  djm@kirby.fc.hp.com
++djm@sportsman.spdomain
 +doogie@brainfood.com
  gm281@boulderdash.cl.cam.ac.uk
  gm281@tetrapod.cl.cam.ac.uk
  harry@dory.(none)

diff --cc xen/arch/ia64/domain.c
Simple merge